Skip to content

rebase(ci): cleanly rebase fix-pr-preview-api-pages onto feat-api-uplift#7005

Merged
jstirnaman merged 2 commits intocopilot/fix-pr-preview-api-pagesfrom
copilot/rebase-onto-feat-api-uplift
Mar 29, 2026
Merged

rebase(ci): cleanly rebase fix-pr-preview-api-pages onto feat-api-uplift#7005
jstirnaman merged 2 commits intocopilot/fix-pr-preview-api-pagesfrom
copilot/rebase-onto-feat-api-uplift

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 29, 2026

copilot/fix-pr-preview-api-pages had accumulated master merge commits that polluted the PR diff — showing 407 changed files instead of the 2 actually touched by the fix.

This branch (copilot/rebase-onto-feat-api-uplift) reconstructs a clean state by resetting to feat-api-uplift and re-applying only the intended fix on top:

  • .github/scripts/detect-preview-pages.js: adds detectApiPages() to auto-map changed api-docs/ files to preview URLs via .config.yml, adds has-api-doc-changes output, fixes needs-author-input to not fire when API pages are already auto-detected
  • .github/workflows/pr-preview.yml: adds "Build API docs" step (yarn run build:api-docs) that runs before Hugo when has-api-doc-changes == 'true'

The branch now differs from feat-api-uplift by exactly these 2 files.

Original prompt

Pull request: #6908 Resolve git histories to rebase the branch cleanly onto feat-api-uplift


📱 Kick off Copilot coding agent tasks wherever you are with GitHub Mobile, available on iOS and Android.

…t base

Reset branch to exactly match feat-api-uplift state plus the PR fix:
- .github/scripts/detect-preview-pages.js: add detectApiPages() and has-api-doc-changes output
- .github/workflows/pr-preview.yml: add Build API docs step

Removes all master-merge pollution from the branch history so that the
PR diff against feat-api-uplift shows only the intended fix changes.

Co-authored-by: jstirnaman <212227+jstirnaman@users.noreply.github.com>
Copilot AI changed the title [WIP] Resolve git histories to rebase the branch cleanly rebase(ci): cleanly rebase fix-pr-preview-api-pages onto feat-api-uplift Mar 29, 2026
Copilot AI requested a review from jstirnaman March 29, 2026 19:23
@jstirnaman jstirnaman marked this pull request as ready for review March 29, 2026 20:06
@jstirnaman jstirnaman requested a review from a team as a code owner March 29, 2026 20:06
@jstirnaman jstirnaman merged commit c26f567 into copilot/fix-pr-preview-api-pages Mar 29, 2026
3 checks passed
@jstirnaman jstirnaman deleted the copilot/rebase-onto-feat-api-uplift branch March 29, 2026 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants